Added a bunch of stuff, including part D
Merge pull request #7 from Callum-/master

Added a bunch of stuff, including part D