Add in more defaults and some more sample data.