Check-in before cleaning up nameviewer, putting adding of nameviewers into actions.