moose
re-factoring to moose
cleaning up makefile
update..