Syncing code to latest spec

Still have Study:POST/PUT/DELETE to go...