Merge v0.01-refactor

Merge in the updates from refactor branch