Prelim work to do listing properly