Some more changes, working with enums, prepping for pxd transition.