Work in progress

r1517.eu