Combine unit and goal so that units only have one goal