Flushing out a bit more structure.