Use history

Merge all the "useHistory" branch changes back into "master".