Working on getting proper rendering architecture back in there.