Initial commit of listings page
fixed merge