Initial working commit for 0.1.0