Nicol

> @nicoldr lgtm, but can you pls resolve comments so that we haven't missed anything. All conversations are resolved and PR has all checks now