More work on Karma integration, still WIP