Almost done for 1.0.1