WIP
Working process
Fix conflicts