I took a shot at rewriting most of the cases...

please look over the cases in the new files... I didnt want to overwrite
your work so I just made new files...