WIP
Connection hooks wip