Some big reorganizing and refactoring to get ready to make the other two tabs.