Core pr 4

Updated to support OG 2.x and the side effects.