Almost done with new server store and some old code updates