Almost done with 0.6.2