Begin adaptation of proxy publisher

TODO: Fix stackoverflow error