Graphics/ian/dev

Passing code to Matt for next step. It'll be back and forth a bunch for a bit as we build on top of each other's code (which is heavily inter-reliant).