Renamed core to proxy, and removed some of the extra chan that were being used when not really needed