basic structure and first mergers cleaned up