0.1.0

Refactor, new functionality