Last modifications, implementing MAIN class
Resolve conflict
Implement input language part 2
Fix build