Fully integrated draft.
Merge branch 'master' of https://github.com/NicholasMolyneaux/pedfluxmidtermreport