Fixed data models bug w/ filtering name, begin work on multi-file support