Modified History to OOP
Major upgrade