merged a couple more modules into utils