Finish infrastructure redux.