More refactoring, efforts to push old messages onto page