Windsor Push

All sorts of fun changes