changed a few things around, stole wander and added librarian