I can address this in a separate PR since that header needs to be updated else where. Cool?