further revision of what goes where
too complex for this loader