reconfigured to work, started writing tests.