Person tests refactowing, work on Lift calss underway