Gallery and Library Functionality Complete