Added some new data types. Only keep stuff in util that's used in multiple locations.
Starting on tests...