Second commit of Change Atmosphere, clean up.