Make command class for later