Gregor's code

@gioe could you please put a link to Gregor's code here?