Begin decoupling listing logic from model list implementation (#2289)

Begin decoupling listing logic from model list implementation (#2289) #2