More changes on the way to windowsForms away from Squid