Further along the rewrite
Merge branch 'master' of https://github.com/blanu/AdversaryLab