Working on incorporating library info