working toward #17