Should this move to shared too?