More work on API (fun fact: 'More work on' is prob the most used phrase in my commit messages)