Work in progress (+2 squashed commit)

Squashed commit:

[485ba76] Work in progress

[b310cc2] Work in progress - Setup AddressCollection next