dvoa: add lines and start reorganizing data