Moved callback stuff to new file
More stuff to do server push to clients