moved stuff to makefile