- refactored controller creation - still lot to do, but it's closer to be fine