Final commit for Cuttlefish solution.