Preliminary version with fixed gitignore