Perhaps made compiler work now
About to merge.
Merged
Fixed parser