move to abstract intermediates

This fixes #19