Switched loading process to use promises