shouldn't we add this to expressions as well? I remember you asking questions about this.