2nd pass - Modal Dialogs / client server interactions working