removed fetch stuff
removed system stuff
adding stuff
Merge branch 'V2-step-four' into V2-step-five
updating with refactor