Replaced all static arrays with ArrayLists
Replaced all static arrays with ArrayLists