More work on window module