Adds support for no image and begins to accomodate an end date