moved code around
fix Makefile so it doesnt always recompile