alternative9 has the final solution, refactoring now
Merge branch 'master' of github.com:allquantor/AD