Work in progress... (crud; must be cherry-picked from test/menu instead)