Apartment POJO has been changed to Address to closer map to database tables. A datasources object has also been created but hasn't been tested yet, infrastructure for data collection is in plays