Working on some supporting utilities