Starting to build out the new API