Class framework there, working on tests