Data-as-expando

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>