redesign bases in class. Tweek library.