Fleshing out ComnmandFactory a bit