Moved to using NSDictionary for cell lookup, which let me pull logic out of the cell views