WIP
Revert "WIP"

This reverts commit 79985657bd9f8d165424af7baacbd8e5997ae9bf.
Revert "Revert "WIP""

This reverts commit a7dec7e7910671a08c2da8c8cf0dd0fd09aa11eb.
WIP
WIP
WIP
Merge pull request #1 from mjonsson/dev

Dev