beginnings of massive rework