prepwork for adding front end display of action costs
prepwork for adding front end display of action costs, pt deux
another merge fix, i think?