Add address

Add address object and move hard coded logic to controller