Made individual collections mostly work. Still need to clear up all
references to new board etc.