Foundations

Aligning foundation and funding logic