Cleanup and adding full family to c code
Resolve conflict on NFC
move people state into user array