Update to foundations - using events rather than dealing with data #SW #BR