Refactor and tidy up of DAH

[adrianmoisey]

I did quite a large cleanup in order to generate cards easier. Since it was quite a big overhaul, I assume it wouldn't be merged in.

If this looks like something that you would merge, let me know and I can tweak accordingly.