WIP: factor out some code, render addresses nicer.