Adding Stephen's things - It wouldn't auto-merge
Fleshing out the plan