Checkpoint, trying to get server side query and demux working