Two big commits we needed this class