Branch changes
Working towards changing tableView type
Making changes
successfully switched tableView types
merge conflicts fixed