Move over to foundation and fix fatal proc bug