Command overhaul - Part 2