Finished loading for external files, need to rework it a little (re-name
things) and then need to finish internal loading
Merge remote-tracking branch 'origin/master'