Tranzition to Lift framework
Merge