Finished adding expression and var checks