v0.0.7 - pretty much finished now