Edited parsing functions. Still need work.