Final listview changes.  It works.