WIP: integrating caelum