big refactor
v0.2.0