Now with fully-functional unit-test suite, but not tested in gui.