Add UC steps and extensions, wip.