1.0.0.8

Nearly done