massive rework; starting from scratch