Needs a complete overhaul of this property-Safety issues.