Changeset 9

Merged base from 20 March and finished adapter for required endpoints.