Pardon our mess as we redo some sections