Added the Treeviews, and decided to change to object-orientated variable naming.