Undo added, works(ish) and new Window works!:D