RE-work

New Command class to handle command issues