Fixed Cases

Cases works for at least one test. Committing just to save, so you may
find some gross errors!