updated match and lineup
added getters for lists in classes
merging