[draft] different approach for makefiles
[draft] changes