Refactored commandAdd no comments for now