fixing the main bit where all the shit goes