Windsor progress - currently commented out