added some sample data, restructured a little