AbstractWindow now stores shapes and draws them