Found out some better ways of organizing