One last push before the weekend to shore up an error on the preview page until refactoring is complete