Massive overhaul of makefile for concurrency