Let's make adding a wrapper the default

See #79