Towards 0.2.1