Using expressions. Kind of messy, but it seems to work...
Merge pull request #1 from wfreeman/exp

Using expressions. Kind of messy, but it seems to work...