Removed the list model classes, switched around some code.