Finished working on the main part of the Parser