undo stuff from simon
Merge branch 'master' of github.com:Hilaryous/walkabout