working on the case stuff
fixed merge conflict in show cases