Working on group build code APPENG-3220