Almost done with 0.0.2