Continued work on 0.2.0