Added expression language with lifted arithmetic
Redesign number umpteen, but now I'm pretty satisfied :)