reorganized the Expr section. Made everything more interconnected, which, interestingly, made it much conceptually easier