Undo and Redo complete
Finished first pass for inheritance