Complete command overhaul