Mid-way commit for modal. Will merge with Chris's code.
Merge unconflicted.