Commands work almost done