Factory done, some tests passing.