merging mjolnir_controller.py