CountNrPeople almost finished, finishing this afternoon
Some changes, will continue tomorrow