v0.1 ready

Should be shippable