Stopped some of the load time
Optimizations and item sort
Switched over to a class based system