Checkpoint.
Fix off by one
commit import script. Not working yet