Incorporated the parser, and made some changes to the classes. Some things work.