Big changes.  Got rid of classes.  Now just using single calls.  Using map events instead of universal button hack.