Update comments to reflect state of code
Working function evaluation in expressions