Object Wrapper Overhaul.