still hacking
found is not None bug
quashed bugs, tests passing