Update for Beta3

Closes #18
Fix visibility of Cartography.h
Remove boilderplate