checkpoint; some tests passing now!