beginning merge process between climate dev rails and this version