added some more integration, still not completed, needs initiation and other infrastructure