fixing shit up and reorganising