Added support for chokepoints, all other data as of 4/26.