Rewrote FileParser, removed LineParser