Util

* pulled out utilities into a new file
* util tests