Added new Makefile (still draft)