Blah
Rest of the refactoring
Merge branch 'kemi' -- Progress