Fiddlin' with wrapper structure mostly.