wip, still busy simplifying Makefiles