Worked on the expression 2 functions some more.