Models working. Still need tweaking to conform to API.