Continuing work on 0.0.11-dev