Added unit parsing to parsing.expressions, didn't include support for
functions yet