nigel: gave up. reverting to simplest version that works locally. Will deal with the build later
nigel: adding promotion fixes