satisfied that I've fixed #2

Could still refine the process so it's automatic instead of manual. But
with latest developments from Dan, I think it's time to start thinking
about the attack problem.