Working on 0.9.0