Major redoing of structure.