prett much done; a bit of styling needed
Merge branch 'master' of https://github.com/liamfurphy/DIM3-TEAM-J