Revert "Remove stuff - big commit"

This reverts commit 1d145c4ce498832bb631c9818530122ca151ed48.