Progressive loading server changes

resetting to master and re-applying all changes in 1 commit, per Javier's suggestion