Half baked collections

Trying to switch everything to new dataaccess model hotness but running
into problems. Few pages break with this new change.