Started adding utils