Trying to add Command type and making a huge mess