Trying to bring part of my fork back up to date