Discarding this commit. All kinda broken, but some good ideas.
Revert "Discarding this commit. All kinda broken, but some good ideas."

This reverts commit e97f478258d4714c2c1491397790e7c680ef91ee.