Refactores leases. Added payment. Looking good so far