Beginnings of redesign

Maybe we can move this loop in a _project partial?