move more code into library