Move more into library