First prototype for issue #52