add test harness for parsing
update test parsing
remove stupid files
merge stupid conflicts
merge stupid gah