+ Merge code with Justin - Finish view history