Refactored Line Up logic into its own class