More porting from etch to the new timeline
Add the window abstraction