rh.models progression refactoring...