Merge code complete for v0.1 :)