AoG dev in progress part 2