Added groundwork for push server