Interim commit (home office transfer)
Compiles again, but rework not finisched.
Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>