remove most of this stuff since most of it is done
New failing test and a ton of debug prints to support it.