Yet more refactoring; getting close to possibly working listing...