Constrained PMF

Think we're mostly done!