Revert "Revert "big merge""

Reverts SoftwareDev/Markus#9