WIP - v0.2

Merge this when all of v0.2 changes are implemented.