New Model scheme
Started implementing selection as well