loading adjustments
refactor into proper modules to work with requirejs