Merging, huge performance increase... + 100% test coverage