Update config, experiment with singleton controllers