Added todos + clarifications
Working sharding for collage