Pushing some changes before I begin work on the API