hey there
Loads of random stuff that nearly got it done but not quite done.
Merge pull request #2 from adamwitko/master

HI! (please don't look at our code)