Continued working on Contractor 3-tier architecture.