added basic pusher features - needs some more work