basic view logic

Views are hooked up to a model that collects data and also iterates through the tree. I merged in master and fixed conflicts. Will continue to update as I can before we meet tonight.