Initial commit of local changes to code
Initial changes for Fetch