bugs: Notes considering maintaining flat structures throughout, and also