added Property Manager, needs fixing