Makefile and readme
Bring together more shared functionality