* Major library refactor