Minor progress towards ADC story branch, add the cyclinglink and replace macros