Sync this and dev/alex
Break out callbacks
Handle parallel checkouts and breakout more