Starting over for the v0.1 branch