Started measure module, and renamed some Util fns