Adding in some functionality for parsing, have to remove bugs.