work in progress Issue #11