updating the rest of classes so that they use makeOrGet instead of just make at indices initialization