I feel like the command list is getting big enough we should consider refactoring it. Maps of lambdas anyone?