Major structural rework & minor fixes. v0.2.0