Massive commit. Code integration, restructuring, new features, UI tweaks.