WIP-Tijn Merge Request

I think the WIP-Tijn branch is ready to merge.