Another commit, now that I've set up my name
pp2 initial commit - switch statements not yet handled