Code clean up, name changes, added lots of new stuff, should be ready for a new build tomorrow