Initial work on v0.2.0