Added more functionality to the main library tentacles