Let’s Get Organized! Long-Term Market Design for a High Penetration Grid