need to confirm, and chalk a block
Merge branch 'master' of ssh://github.com/marcusjbishop/104
naja, probably enough for friday