Updated cmd stubs
Added cmd stubs
Updated TODO notes