This is to address #1875 more quickly than via #345. This commit only includes a partial implementation of the UI - see the ticket for details.