updated with edit -- fully functioning-- no search item yet