Super-duper v0.2.0-dev refactor