server side ready
Merge pull request #17 from tckeelin/925-endpoint-data-manager-tk

server side ready