work on #247; pushing so I can get updates and run experiments on the imac