Form service REST API, tests need to be added still
merged with master