Heavily refactored the excel loader to make it easier to work with