Super major super super major overhaul of material list complete.