working organizing classes.
working on tests.