#424 progress with apiary