Implementation of adapter among other things
Merge branch 'master' of https://github.com/Enniwhere/hotciv