Just checkpoint, need to work on some version upgrades before continuing