refactor in prep of vmmap