More structural progress
Even more structural revisions