WIP Add Modal infastructure

addresses #2416