Added fetch and associated controls as well as cleaned up some files.