0.2.0 refactor