Note that this class no longer exists in my PR