Can return to library
Begins to implement changes from Shawn's code review