Referencing my fork for now until I have time to test latest changes