more reorganzing and getting stuff ready for threading