Massive manifest update

Not sure why this keeps disappearing...