Added beginnings of a way to change data souce and data type.