Working on v2, catching some bugs, swagswagswagswag
Fix merge conflict in Makefile.