Huge refactoring WIP 8 - Not crashing anymore :)
Huge refactoring, WIP9 - more tests onboard :)
Added back normalization
Fixed a problem likely related to #96