V0.0.6

Almost done. To be tested.