More progress on Commands