Working on add_window and HelpWindow