Adding room logic and list view.
Huge Update!