Another checkpoint.

Some issues here though.