Shifted some features over to clumsy/utils