Wip/server event/get

This is essentially the same as before + Craig's changes for added stability on add event and get event. This has been merged into dev and is ready to go.