No need for hashmap anymore, switched it back to arraylist.