Yep! Assuming we can come to agreement on this PR, which is mostly specs, we'll crank up a new PR and get the Identity refactor done in the next couple of days. Then we can move forward on the other services...