Chris's first updates

Edits from @chrislintott