Another interim commit:  cuckooing is buggy but works slightly.  Current test case fails.