Ported over the rest of the commits