working on #13 still ...