closing in on #54 and #51