Ecgprc sprint2

Merge Server Work Into Master Branch