Rebasing
Lots of work for command validation
Fixes for build