v0.1 - Some things implemented