Some more stuff and a window to go with it