Huge design update.