STILL TODO and WIP, this draft for now is not intended for merge but for commenting on the ARP code changes