Final changes to logic for proper parsing. Assignment 1 logic complete.