New loader

Processing all branches into master for phase 1 submission.