First commit. Working expression syntax. WIP re-utilizing the when expression listener