nice pattern!  worth moving to CommonCommands ?