start of change to make server fully REST