threads and queues, awww yeah
changed Makefile
fixed git shenanigans