Finished up library classes