Migrating a couple utils into this collection