MAJOR coding changes. Added two classes, changed the way a few work, made life easier for both of us. :)