More progress. See #259