Refactor BodLab Classes, Generics, Methods.  BondLab no longer working