Split out to a fragment I guess