working towards 0.6.0