Added a few string utilities and trying to fix the data class...