rework stuff. a lot.