commit initial update for question
fix conflicts
fix 2d array and exported database