Move embargo and lease logic from Embargoable and into Embargo and Lease classes