Working on refactor of using data files, now compiles again