Undo now works, kinda