Nice detail, but again I'm not sure if this belongs in the data object?