Closes #69.  Updated Apiary prototype to reflect changes in API