Parameterizing harder

This should be part of #40