More WIP on PTP tab