Get started moving the right markup in

Halfway there