Initial batch of changes to split up acf and vhsl bonuses
second part of splitting acf and vhsl bonuses
3rd part of acf vhsl change