can you add a TODO here that we need to make sure there's a default section before we can do the above?