wip
update
updates
fix
works
refactoring
0.8.0 wrapping up
Merge branch 'wip'