Lots of work to push a release tonight, but still some more work before version 1