Some Updates to the Window Function.

Buttons Arn't work yet for the pedantic Amongst you but I'm starting to get an architecture in place.