WIP - modifying DataModel to include files specified by administrator