Finished more methods for parsing

Parsing almost done, need to do a test run.