Cleaned up REST service
Working...