Completed Listing functionality.
Merge origin/master
Completed Listing functionality.