Updated Parser. Basically working.