incremental work for listing support, still incomplete