File parsing changes to main file/isolating logic errors