EST-203: Lease calculation by selecting a property

The old method with a lease wildcard had been made @Prototype so it could be salvaged if needed