Moved from strings to actual objects that hold a name and a picture