WIP commit for adaptor generator
Adaptor generator appears to be fully functional