Started swapping out ArrayList for HashMaps