large rework of what has been done to this point