Initial code for Phase 3
Merge branch 'master' of https://github.com/TeamSYC/phase3