More work on #67, everything works

Better close that bug before I come up with more test cases :p