Finishing up V 1.0