@Raydiation this controller is implemented on basis if what is there in core at the moment - we can reengineer the code once appframework is merged - next week most probably.

I'd leave that for now and get this beast going ;-)