got rid of all the cases, merged the change files
Work In Progress

please wait warmly until edits are ready