Cg 20140106

Please review commands and unit tests.