about to split to multiple sources
added makefile
merged makefile changes