Done some stuff to the proxy and the entity controller