Feature/flatten everything