0.0.1 Mostly done, pending testing