Complete re-build

Complete re-build, still v0.6.9
er

er