v0.4.3

Major refactoring