0.2.0, tweaks to existing version, version two of prototype