AOGP-ify build part 1