Fixed some preemptive loading. Imports are still not in an optimal order