Some refactor and some more logic to decide when to load the whole doc
or just a cell info