Fixed file parsing; implementing sorting now