Issue #124, still needs validation for geo and columns. Columns are now deleted and re-validated though
Merge branch 'blackwell' of github.com:tdt/core into blackwell