More restructure goodness... Still broken