RESTWS-309: Work In Progress
RESTWS-309: Functional. Tests still need to be fixed.