New Branch with scene and window

Merged AH-26 and AH-31