new lineup
complete lineup (lacking query optimization try)
Merge branch 'newlineup'