Debugging is mostly finished
Merged conflicts