fixing up models and RestService