First compile-able version. Updated Makefile also