Working on #27.2