Refactor the version 5 getListing to transfer code to  the models
Merge branch 'brian'