Added size and color parameters

Also changed TwoDimensionalData to read string instead of int - this
could probably be handled more elegantly, but I needed to pass in some
text data.