Working on peer api