Working in progress for v.0.0.9