Progress on #14, but UX is obscure