Checkpoint before listadapter refactor