Merging, started work on handling multiple jobs and peers