Most of the way to working library updates