Working on it
Lots of work for command validation