Done with initial v0.2 refactor, still requires testing and more review