Improve load times

DRASTIC IMPROVEMENT