moving more stuff to the library