Refactoring essentially complete. Bumping to 0.3.0.