split up wrapper, update to taffy 2.7.2