Got system working.
Fixed case statement merge conflict.
Nothing new. We can probably ignore whatever I did
cleanup
update
updating views and permissions