People overhaul

not ready yet, but here for so I can track the diff.