Initial server push
Lots of functional changes