Duh: Fixed some errors, moved stuff around to load in different order