Update the api to actually work

This should have been merged with the previous things from a month ago.