Started branch set
v0.1.0 cleanup