A 21st century approach to infrastructure