Moved stuff into the proxy
moved config handler aswell