Some refactoring. Still 124 tests failing...
Merge branch 'promise-unit' of github.com:tbrolin/unIts into promise-unit