So, after some down time in the project, I have started looking into the code again. I have finally installed Sonar on the build server - and it dug up quite a few skeletons from the old parts of the code. I have spent a few days refactoring some of the central classes that really needed looking into.

I also got some unexpected - but very appreciated help, Christian Aune Thomassen has updated my CUL-firmware to support CUL V3 - thanks Christian!