Finished a skeleton with the content added from the two surveys. Now comes the real reorganization.