Reorder loading to fix some bugs, maybe create some new ones