Math and aggregate expressions

I did, just for some reason did not add that to the commit.