hacked around the failed crosschecks, but it is beginning to look like redesign is unavoidable to continue progressing.