Added a whole lot.  Still need to do final pruning