had to reintroduce unit parsing logic in the preparser but my tests are all passing now YAY!!!