Prep for compare mode
Range bug
Changes to data modls, rough idea for compare mode. Reuse functions from fac where poss