Starting to add Window tracking