fixed some breaks
changes
merged
merging added parser code
working merge