still working on property map