WIP: Update modal controller