Added Case/Then syntax. Started to add explicit case syntax and tests
Mixed patterns now work better