Pushing on through implementation
finished yesterday's tweaks. Will do later stuff later
Merge branch 'master' of github.com:allyjweir/dissertation-teamt-tp3