Lots of changes. v0.7