Working towards 1.0-dev