commiting before pull
fixing up testing
parsing issues from brians example fixed. fixed some testing things. will still prob cause problems with travis