Continuing development on 0.0.7-dev