Major refactoring - WIP
Version 0.4.0