Moving more of the API to Bolt