Lots of additions to bump to v0.5