started changing structure, making mock data