working simplified version
cleanup, makefile