added getters and changed some variables to ArrayLists