[TASK] No longer using content collections and lots of small additions