Working on API spec - unfinished