Refactoring essentially complete. Bumping to v0.0.2