Lots of updates around the api and jobs