Work on the new window code - steps
Finished #13