Revert "Much work, is broken atm however." --- wrong branch

This reverts commit 08c791fde71c96bfb24d4464fd4d0bd6c249a699.