A whole slew of updates and some major refactoring.