Tom's Infra Details

I don't really know what our commit policy is here. Looks a pull request. Let me know whether I should just pull it myself next time.