Update Festive 2

Move much of festivities 2 into 3