Added window tracking logic to the engine rather then loader