TODO
Add position to explicitly-demanded message