v0.3 - lots of additions