more refactoring of adapters into view models
more refactoring of adapters into view models