HELP! Water heater questions

[Nnamdi Mowete]

My property is a single family home that was converted into a duplex. Because of this, the property has one gas water heater. Recently, the city of Wilmington inspected my property. They said that because my home has two units with tenants, that I need two water heaters. Is there any way around this?

If not, I am writing down a list of work that I need to be done. So far, I have new gas water heater, separate water lines, and I think I need another gas meter because my property currently only has one. Is there anything else I am not thinking of? Also, would anyone like to refer someone in the tri-state area? Thank you