Cleaned up program parser. Added other binary ops for BinaryOperatorExpression
Fixed function test
Cleaned up function parser
Small cleanup
Revert
Reverted circular