Added return expressions
Started change for expression evaluating
Revert "Started change for expression evaluating"

This reverts commit e3073c283b9d6a117210b2a5c364ea20a18840d9.