That bit is ready for review. Since the other one is bigger I feel like I should annotate it before asking folks to look at it