refactor adapters complete
Merge pull request #279 from patriot1burke/master

refactor adapters complete