Working on client query and serving
Merge branch 'master' of github.com:sparks/rter