Re-factor, hige loader refactor. Add, base demands models