Towards 0.0.7