[WIP Do Not Merge] - Contact manager revision