More metadata

Refactored a bit. I want to merge this refactor, but take out the extra json properties (extent and center).