Decoupling renderers and controllers progress
More decoulping changes