silly merge conflict
mostly proper dependencies in Makefile. Ish was hard doe