working on structure and flow