More work on v0.1