Finished up major parts of library