Updating for case commands. Other changes too.
Merging remote into local branch.
Fixing merge conflicts.