WIP: Add source address to PoolManager

This is #376 after a rebase. Shortly I'll address the review comments there and get this into a merge ready state.
Oh woops wrong file, this is fine.