Implemented a horrible ListView....
Merge branch 'develop'

* develop:
  Implemented a horrible ListView....