0.2.0 WIP

Contains work to be included in v0.2.0.