Changeset 13

All endpoints integrated!