Almost finished the person implementation
Mergin to master