starting to clean up wrappers.js