Fix weird loading logic

Now everything's clean and the way it's intended to