more cleaning up of the modularization, including the user mapping trickiness