Lesley's Library code

@taylor-smith, @truffaut