Nearly finished 0.0.7