Library munger

pulling craig's changes into my branch