Continued to change ExpressionReference

Waiting on discussion on issues for more stuff to do