More Domain model manipulation (mostly).  Some client-side cleanup.