Clean up Makefile
Add in explicit histogram structures
First pass at histogram code
Basic points code