Core pr 4

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