[dhammacher] commented TODOs on code integrated by Raffaela; 
Also did some refactoring bringing the files into groovy syntax, using
the logger function instead of sysout; not everywhere yet though. marked
rest with todos