Start of window builder
Merge remote-tracking branch 'origin/Window-block-creation'