added case expressions (only evaluating so far)