Finished parsing functions and added comments