Simplified design, and added new test for single file. Compiles and tests pass for what is currently written.