Demo

Adds addresses, works through demo odds and ends