Cleaned up exports, early data code