WIP to get everything integrated into oonicli
More progress towards getting everything to work