Rework into library.