Starting to reorganize and extend Spatial modeling stuff.