We can map address points separately within the building.  Are these placed correctly?  I'm guessing the 24th street addresses are upstairs and downstairs.

https://www.openstreetmap.org/node/11635628516
https://www.openstreetmap.org/node/11635628517
https://www.openstreetmap.org/node/11635628518