working on the restful stuff
fixed conflicts