Realized how threading might have broken things... removed it