Made loading more robust and modular; created two new Components.