Worked on lineup functionality