More ctx/window building
Refactor/close