Done and done. (not pushing incrementally to avoid melting Travis)