REST in progress. fixed messages