Optimized Q3 - Q1, Q3 done
Merge branch 'master' of https://github.com/TeamSYC/phase3