Vivaldi peer merge attempt

Pull request to merge the modifications to be able to use it on G5K.

Please merge it today before 9pm.

Local test also moved. Run it with "sbt run"