Draft refactor with url-centric addresses.