Pending — bugs from the earlier review still need fixing before this ports

Crown fix applied — pending local fallback bank + persistence