plural
baby steps
more baby steps
for now, second fix-em-up pass
looking good except for stragglers
tests pass