Here we go moving off gen commands to its own class