Attempting to update my fork... I think this is how it works...