Command callback is now more properly passed around (still unstable).