Total Addresses working properly, need better coverage