Added to-do to Window.java