Co-authored-by: Nick Brassel <nick@tzarc.org>
* reset; redoing my steps; and recommit * include xd002/.noci