Anthony Joshua bill begins to take shape, Okolie v Glowacki added