Utils upgrade

Closes #153 (closed)

This addresses a bunch of the stuff discussed. I still want to add more tests but things seem to be way more consistent now.

I will try to make this ready to be merged by the end of the year.