buggy code commented out.

Have to look at allocator, among other things.