Code finished, debugging
Merge