Auto-wrapping for nsls2 library

~~In progress, don't merge  yet~~ I think this should be good for merging
Why are this and the next bit commented out?