Now working on v0.0.6