Cleaning up some code in hopes of an alpha release in the next day or two.