Finished adaptation for union-based cell - compiles now