[WIP] Simplyfy address

Fixes #190