Temporary upload 5

Everything should be in place but need to do some debugging today later
on.
Revert "Temporary upload 5"

This reverts commit 79b6d60c78d0c14aeea713fc11ae085b2b348b9b.
Temporary upload 6

I dunno what happened with the last commit...