Additional changes

Program now eats more. The default expressions will be limited, most
likely I'll use a loop later to do all the case/switch stuff.