EOD Friday. Need to add UNDO functionality