Adding file parsing
New files, needs some cleanup, untested