Really made it a library this time