clean up models

Change-Id: Ic2dc805267080aa3a59e9da3fee29244c6fdafb6
flesh out api further

Change-Id: I6d9a0ab77e29fe423b90c758d80ea29078c7c451