Work in progress page - Takacs Pal commit and Kalmar Gabor commit (conflict error with forked repo)