v0.30
Done a lot of refactoring...