Merge me final

Hi Tobias,

Sorry for the confusion. Here is what we should merge. It will have the same problems as before but you should be able to do the same method you described for the other PR with this one.