These ArrayLists need to go..... attempting to fix after this commit