First build of 0.0.1 - cleaned up to 0.0.2