Rolling some stuff back for Version 0.1 release