Removing all the dumb is_loading stuff, and including a few optimizations to loading