Moved Command parser to Logic