Bunch of work on threads and queues, plus main
Mergy Merges

Conflicts:
	src/main.cpp