Redoing how commands are handled client-side