Replaced all int arrays with Integer ArrayLists