Bundled window
Revised code. Look at TODO statements and DEBUG statements