Simplify toolkit calls.
Add New... menu item for testing.