Command and Word classes didn't add properly in the first commit.