Starting to refactor the API request views to make them more extensible