Revert "Revert "Version 0.8.0 - more decoupling""

Going to newest working version

This reverts commit abf0812a948d4fe7e8107e9e7bf069d8bd771ba8.