oops did not commit

Eh up @opyate @Skablam @ptrelease 

I'd like to humbly suggest the following that help me get up and running locally with this. Anyone like to try this branch out locally and see if it helps?

Oh yeah please note I have completely bodged unit tests for the moment.