Build out more of the skeleton

Also converted to single quotes