Slowly mergin my fork into the original code