Another checkpoint. Still a work in progress.