Lease preparation service implemented.
Fixing merge conflicts.