Sasha/controller

Take control server out of the proxy code to allow pluggable controllers