reincorporating

adding some function from MVC discovery, and reducing list tables to
single model