Working on 0.7.1 - Tests currently failing.