Make the api a little more consistent so we can add a frontend to it if needed.