Changed threading scheme around, works better with counting. Also added some more windows