Zoe & Jamie | Merge conflicts and tidying up