Reworked the classes to work with ArrayLists.