Can this be handled through the Distro::COMMANDS?