Ra/goldencahill

WORK IN PROGRESS