Ok. It is weird because that is what I did at first and I got "cannot pickle function errors". Maybe it was because I did not create a module at that time.
Files merged --> I will wait as long as I can to commit then, otherwise the diff will be broken.